118. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2024-03-04 14:38:49 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

118.1 Files compared

#	Location	File	Last Modified
1	/Users/coca/Documents/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme v4.0.7/app/design/frontend/Smartwave/porto/Magento_Catalog/templates/category	description.phtml	2023-03-06 04:46:28 +0000
2	/Users/coca/Documents/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme v4.0.8/app/design/frontend/Smartwave/porto/Magento_Catalog/templates/category	description.phtml	2023-03-06 04:46:28 +0000

118.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	1	80
Changed	0	0
Inserted	0	0
Removed	0	0

118.3 Comparison options

Whitespace	Consecutive whitespace is treated as a single space
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail
Active line-pairing rules

118.4 Active regular expressions

No regular expressions were active.

118.5 Comparison detail

1	<?php	1	<?php
2	/**	2	/**
3	* Copyright © 2015 Magento. All rights reserved.	3	* Copyright © 2015 Magento. All rights reserved.
4	* See COPYING.txt for license details.	4	* See COPYING.txt for license details.
5	*/	5	*/
6		6
7	// @codingStandardsIgnoreFile	7	// @codingStandardsIgnoreFile
8		8
9	?>	9	?>
10	<?php	10	<?php
11	/**	11	/**
12	* Category view template	12	* Category view template
13	*	13	*
14	* @var $block \Magento\Catalog\Block\Category\View	14	* @var $block \Magento\Catalog\Block\Category\View
15	*/	15	*/
16	?>	16	?>
17	<?php	17	<?php
18	$_category_desc = $this->helper('Smartwave\Porto\Helper\Data')->getConfig('porto_settings/category/category_description');	18	$_category_desc = $this->helper('Smartwave\Porto\Helper\Data')->getConfig('porto_settings/category/category_description');
19	?>	19	?>
20	<?php if (!$_category_desc && $_description = $block->getCurrentCategory()->getDescription()): ?>	20	<?php if (!$_category_desc && $_description = $block->getCurrentCategory()->getDescription()): ?>
21	<div class="category-description">	21	<div class="category-description">
22	<?php echo $this->helper('Magento\Catalog\Helper\Output')->categoryAttribute($block->getCurrentCategory(), $_description, 'description') ?>	22	<?php echo $this->helper('Magento\Catalog\Helper\Output')->categoryAttribute($block->getCurrentCategory(), $_description, 'description') ?>
23	</div>	23	</div>
24	<script type="text/javascript">	24	<script type="text/javascript">
25	require([	25	require([
26	'jquery'	26	'jquery'
27	], function ($) {	27	], function ($) {
28	var resizeDesc = function(){	28	var resizeDesc = function(){
29	var $d_h = $('.page-wrapper .category-description').height();	29	var $d_h = $('.page-wrapper .category-description').height();
30	$('body:not(.cms-index-index) .page-wrapper > .breadcrumbs + .page-main > .page-main-inner > .sidebar-nav').css({	30	$('body:not(.cms-index-index) .page-wrapper > .breadcrumbs + .page-main > .page-main-inner > .sidebar-nav').css({
31	'margin-top': -$d_h	31	'margin-top': -$d_h
32	});	32	});
33	}	33	}
34	resizeDesc();	34	resizeDesc();
35	$(window).resize(function(){	35	$(window).resize(function(){
36	resizeDesc();	36	resizeDesc();
37	});	37	});
38	});	38	});
39	</script>	39	</script>
40	<?php endif; ?>	40	<?php endif; ?>